Skip to content

Try merge dev#1

Merged
Someone-193 merged 8 commits intoSomeone-193:devfrom
ExMod-Team:dev
Jun 13, 2025
Merged

Try merge dev#1
Someone-193 merged 8 commits intoSomeone-193:devfrom
ExMod-Team:dev

Conversation

@Someone-193
Copy link
Copy Markdown
Owner

Why is github so schizo 😭

MikeSus1 and others added 8 commits June 13, 2025 00:13
* fix KeybindSetting and RoundEnd transpiler

I think it all works, I ran server and no errors, I got on and ended round and no errors

* Fix Scale (ScaleController is mid) Fix ChangingLeverStatus event

I think these work
Fix dropping/dropped item event
## Description
**Describe the changes** 


**What is the current behavior?** (You can also link to an open issue
here)


**What is the new behavior?** (if this is a feature change)


**Does this PR introduce a breaking change?** (What changes might users
need to make in their application due to this PR?)


**Other information**:

<br />

## Types of changes
<!--- What types of changes does your code introduce? Put an `x` in all
the boxes that apply: -->
- [x] Bug fix (non-breaking change which fixes an issue)
- [ ] New feature (non-breaking change which adds functionality)
- [ ] Breaking change (fix or feature that would cause existing
functionality to change)
- [ ] Documentations
<br />

## Submission checklist
<!--- Put an `x` in all the boxes that apply: -->
- [ ] I have checked the project can be compiled
- [ ] I have tested my changes and it worked as expected

### Patches (if there are any changes related to Harmony patches)
- [ ] I have checked no IL patching errors in the console

### Other
- [ ] Still requires more testing
## Description
**Describe the changes** 


**What is the current behavior?** (You can also link to an open issue
here)


**What is the new behavior?** (if this is a feature change)


**Does this PR introduce a breaking change?** (What changes might users
need to make in their application due to this PR?)


**Other information**:

<br />

## Types of changes
<!--- What types of changes does your code introduce? Put an `x` in all
the boxes that apply: -->
- [ ] Bug fix (non-breaking change which fixes an issue)
- [ ] New feature (non-breaking change which adds functionality)
- [ ] Breaking change (fix or feature that would cause existing
functionality to change)
- [ ] Documentations
<br />

## Submission checklist
<!--- Put an `x` in all the boxes that apply: -->
- [ ] I have checked the project can be compiled
- [ ] I have tested my changes and it worked as expected

### Patches (if there are any changes related to Harmony patches)
- [ ] I have checked no IL patching errors in the console

### Other
- [ ] Still requires more testing
@Someone-193 Someone-193 merged commit f158b7b into Someone-193:dev Jun 13, 2025
Someone-193 pushed a commit that referenced this pull request Aug 1, 2025
)

* loader updoot & removed unused using

* Update EXILED/Exiled.Loader/Loader.cs

Suggestion #1

Co-authored-by: Alex Rouse <123724383+ALEXWARELLC@users.noreply.github.com>

* Update EXILED/Exiled.Loader/Loader.cs

Co-authored-by: Alex Rouse <123724383+ALEXWARELLC@users.noreply.github.com>

* moved method
private methods should be defined after public ones

* updoot exiled kill sissues

Co-authored-by: Alex Rouse <123724383+ALEXWARELLC@users.noreply.github.com>

* updoot exiled kill sissues

Co-authored-by: Alex Rouse <123724383+ALEXWARELLC@users.noreply.github.com>

* updoot exiled kill sissues

Co-authored-by: Alex Rouse <123724383+ALEXWARELLC@users.noreply.github.com>

* updoot

* fixed the infamous error

* rollback - not same pr

* fix Conflict from Merge branch 'dev' into pr/89

* Update Loader.cs

---------

Co-authored-by: Alex Rouse <123724383+ALEXWARELLC@users.noreply.github.com>
Co-authored-by: Yamato <66829532+louis1706@users.noreply.github.com>
Co-authored-by: Yamato <louismonneyron5@yahoo.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants